Update to use the new g_boxed_type_register_static API.

2001-09-10  Alex Larsson  <alexl@redhat.com>

	* demos/gtk-demo/stock_browser.c:
	* gdk/gdkcolor.c:
	* gdk/gdkcursor.c:
	* gdk/gdkevents.c:
	* gdk/gdkrectangle.c:
	* gtk/gtktypeutils.c:
	Update to use the new g_boxed_type_register_static API.

diff --git a/ChangeLog b/ChangeLog
index 9ca8eec28610be86e56d45f264054aaf6d8cfb97..549dbe1b70dd4d0ab4c2943cd3ddb2bf9b8622e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-09-10  Alex Larsson  <alexl@redhat.com>
+
+       * demos/gtk-demo/stock_browser.c:
+       * gdk/gdkcolor.c:
+       * gdk/gdkcursor.c:
+       * gdk/gdkevents.c:
+       * gdk/gdkrectangle.c:
+       * gtk/gtktypeutils.c:
+       Update to use the new g_boxed_type_register_static API.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtktreestore.c:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9ca8eec28610be86e56d45f264054aaf6d8cfb97..549dbe1b70dd4d0ab4c2943cd3ddb2bf9b8622e0 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+2001-09-10  Alex Larsson  <alexl@redhat.com>
+
+       * demos/gtk-demo/stock_browser.c:
+       * gdk/gdkcolor.c:
+       * gdk/gdkcursor.c:
+       * gdk/gdkevents.c:
+       * gdk/gdkrectangle.c:
+       * gtk/gtktypeutils.c:
+       Update to use the new g_boxed_type_register_static API.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtktreestore.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9ca8eec28610be86e56d45f264054aaf6d8cfb97..549dbe1b70dd4d0ab4c2943cd3ddb2bf9b8622e0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2001-09-10  Alex Larsson  <alexl@redhat.com>
+
+       * demos/gtk-demo/stock_browser.c:
+       * gdk/gdkcolor.c:
+       * gdk/gdkcursor.c:
+       * gdk/gdkevents.c:
+       * gdk/gdkrectangle.c:
+       * gtk/gtktypeutils.c:
+       Update to use the new g_boxed_type_register_static API.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtktreestore.c:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9ca8eec28610be86e56d45f264054aaf6d8cfb97..549dbe1b70dd4d0ab4c2943cd3ddb2bf9b8622e0 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+2001-09-10  Alex Larsson  <alexl@redhat.com>
+
+       * demos/gtk-demo/stock_browser.c:
+       * gdk/gdkcolor.c:
+       * gdk/gdkcursor.c:
+       * gdk/gdkevents.c:
+       * gdk/gdkrectangle.c:
+       * gtk/gtktypeutils.c:
+       Update to use the new g_boxed_type_register_static API.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtktreestore.c:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9ca8eec28610be86e56d45f264054aaf6d8cfb97..549dbe1b70dd4d0ab4c2943cd3ddb2bf9b8622e0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2001-09-10  Alex Larsson  <alexl@redhat.com>
+
+       * demos/gtk-demo/stock_browser.c:
+       * gdk/gdkcolor.c:
+       * gdk/gdkcursor.c:
+       * gdk/gdkevents.c:
+       * gdk/gdkrectangle.c:
+       * gtk/gtktypeutils.c:
+       Update to use the new g_boxed_type_register_static API.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtktreestore.c:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9ca8eec28610be86e56d45f264054aaf6d8cfb97..549dbe1b70dd4d0ab4c2943cd3ddb2bf9b8622e0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2001-09-10  Alex Larsson  <alexl@redhat.com>
+
+       * demos/gtk-demo/stock_browser.c:
+       * gdk/gdkcolor.c:
+       * gdk/gdkcursor.c:
+       * gdk/gdkevents.c:
+       * gdk/gdkrectangle.c:
+       * gtk/gtktypeutils.c:
+       Update to use the new g_boxed_type_register_static API.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtktreestore.c:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9ca8eec28610be86e56d45f264054aaf6d8cfb97..549dbe1b70dd4d0ab4c2943cd3ddb2bf9b8622e0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2001-09-10  Alex Larsson  <alexl@redhat.com>
+
+       * demos/gtk-demo/stock_browser.c:
+       * gdk/gdkcolor.c:
+       * gdk/gdkcursor.c:
+       * gdk/gdkevents.c:
+       * gdk/gdkrectangle.c:
+       * gtk/gtktypeutils.c:
+       Update to use the new g_boxed_type_register_static API.
+
 2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtktreestore.c:

diff --git a/demos/gtk-demo/stock_browser.c b/demos/gtk-demo/stock_browser.c
index 2a68f1a02a078cb02b190cc8414de94f76e9d0e1..fd1d0ef7daef39faa8649254534156798147ed54 100644 (file)
--- a/demos/gtk-demo/stock_browser.c
+++ b/demos/gtk-demo/stock_browser.c
@@ -65,10 +65,8 @@ stock_item_info_get_type (void)
   
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("StockItemInfo",
-                                            NULL,
                                              (GBoxedCopyFunc) stock_item_info_copy,
-                                             (GBoxedFreeFunc) stock_item_info_free,
-                                            FALSE);
+                                             (GBoxedFreeFunc) stock_item_info_free);
 
   return our_type;
 }

diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index 3e034936350f28e7da2c8d955748e65211c2f9f4..c27aa40fb5a904038a0c63fb2288579e46cad0f2 100644 (file)
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -224,9 +224,7 @@ gdk_color_get_type (void)
   
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("GdkColor",
-                                            NULL,
                                             (GBoxedCopyFunc)gdk_color_copy,
-                                            (GBoxedFreeFunc)gdk_color_free,
-                                            FALSE);
+                                            (GBoxedFreeFunc)gdk_color_free);
   return our_type;
 }

diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index ca1ff045aaa64f452eaa7b338235611eddfcbc36..4f42d0901bb5952624979d1428faaab804a9eab2 100644 (file)
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -34,10 +34,8 @@ gdk_cursor_get_type (void)
   
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("GdkCursor",
-                                            NULL,
                                             (GBoxedCopyFunc)gdk_cursor_ref,
-                                            (GBoxedFreeFunc)gdk_cursor_unref,
-                                            TRUE);
+                                            (GBoxedFreeFunc)gdk_cursor_unref);
   return our_type;
 }
 

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 7b9d3dccb63ac79930fa8999eb834bd112416eb3..4aa9614e3a35becb3a11b328d2bacc2e15ea3eed 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -1000,10 +1000,8 @@ gdk_event_get_type (void)
   
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("GdkEvent",
-                                            NULL,
                                             (GBoxedCopyFunc)gdk_event_copy,
-                                            (GBoxedFreeFunc)gdk_event_free,
-                                            FALSE);
+                                            (GBoxedFreeFunc)gdk_event_free);
   return our_type;
 }
 

diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index 27e181c535ff5a263be147098bcd4453e2959feb..c480d9f998a4f8e99cb65c48fed5817117310d50 100644 (file)
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -98,10 +98,8 @@ gdk_rectangle_get_type (void)
   
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("GdkRectangle",
-                                            NULL,
                                             (GBoxedCopyFunc)gdk_rectangle_copy,
-                                            (GBoxedFreeFunc)g_free,
-                                            FALSE);
+                                            (GBoxedFreeFunc)g_free);
   return our_type;
 }
 

diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c
index c49a69a8db4a644a7e02bcdda442d3f8fa3796be..f5b19180935cc40281636b884c3b49212acce61d 100644 (file)
--- a/gtk/gtktypeutils.c
+++ b/gtk/gtktypeutils.c
@@ -169,25 +169,10 @@ gtk_type_init (GTypeDebugFlags debug_flags)
            type_id = g_flags_register_static (builtin_info[i].type_name, builtin_info[i].pointer1);
          else if (builtin_info[i].parent == GTK_TYPE_BOXED)
            {
-             static const gchar *copy_types[] = {
-               "GtkSelectionData", "GtkBorder", "GtkTextIter", "PangoTabArray",
-               "PangoFontDescription", "GtkTreeIter", "GtkTreePath", "GtkRequisition"
-             };
-             gboolean ref_counted = TRUE;
-             guint j;
-
-             for (j = 0; j < sizeof (copy_types) / sizeof (copy_types[0]); j++)
-               if (strcmp (copy_types[j], builtin_info[i].type_name) == 0)
-                 {
-                   ref_counted = FALSE;
-                   break;
-                 }
              if (builtin_info[i].pointer1 && builtin_info[i].pointer2)
                type_id = g_boxed_type_register_static (builtin_info[i].type_name,
-                                                       NULL,
                                                        builtin_info[i].pointer1,
-                                                       builtin_info[i].pointer2,
-                                                       ref_counted);
+                                                       builtin_info[i].pointer2);
              else
                type_id = g_type_register_static (GTK_TYPE_BOXED, builtin_info[i].type_name, &tinfo, 0);
            }